From: Hans van Kranenburg Date: Mon, 26 Mar 2018 01:50:48 +0000 (+0200) Subject: debian/patches/misc/version.diff: refresh X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~93 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=26dfdafd9d8b5eb653626d5c32b5e3171bd8e416;p=xen.git debian/patches/misc/version.diff: refresh Upstream commit aa96a59dc22 touched the context lines. --- diff --git a/debian/patches/misc/version.diff b/debian/patches/misc/version.diff index a6735a34be..5124f0b9df 100644 --- a/debian/patches/misc/version.diff +++ b/debian/patches/misc/version.diff @@ -33,7 +33,7 @@ Patch-Name: version.diff include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s --- a/xen/common/kernel.c +++ b/xen/common/kernel.c -@@ -330,8 +330,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL +@@ -357,8 +357,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, deny ? xen_deny() : xen_compiler()); @@ -91,8 +91,8 @@ Patch-Name: version.diff return ""; --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c -@@ -783,14 +783,11 @@ void __init console_init_preirq(void) - serial_set_rx_handler(sercon_handle, serial_rx); +@@ -847,14 +847,11 @@ void __init console_init_preirq(void) + #endif /* HELLO WORLD --- start-of-day banner text. */ - spin_lock(&console_lock);